From a03e299feab3c7294b59e734a6a26cfb632d645b Mon Sep 17 00:00:00 2001
From: robertl <robertl@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Mon, 28 Jul 2003 20:56:00 +0000
Subject: [PATCH] Add additional cache types for Magproto. Misc lang cleanups.

---
 gpsbabel/defs.h     | 2 +-
 gpsbabel/magproto.c | 2 ++
 gpsbabel/mkshort.c  | 4 ++--
 gpsbabel/util.c     | 7 ++++++-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index cbccd7863..e2c309ac0 100644
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -228,7 +228,7 @@ void *MKSHORT_NEW_HANDLE(DEBUG_PARAMS);
 #define mkshort( a, b) MKSHORT(a,b,__FILE__, __LINE__)
 #define mkshort_new_handle() MKSHORT_NEW_HANDLE(__FILE__,__LINE__)
 #endif
-void *mkshort_del_handle(void *h);
+void mkshort_del_handle(void *h);
 void setshort_length(void *, int n);
 void setshort_badchars(void *, const char *);
 void setshort_mustupper(void *, int n);
diff --git a/gpsbabel/magproto.c b/gpsbabel/magproto.c
index b9b3af6be..0d191a99f 100644
--- a/gpsbabel/magproto.c
+++ b/gpsbabel/magproto.c
@@ -156,6 +156,8 @@ static icon_mapping_t map330_icon_table[] = {
 	{ "ah", "Virtual cache"}, 	/* Binos: becuase you "see" them. */
 	{ "ak", "Micro-Cache" },	/* Looks like a film canister. */
 	{ "an", "Multi-Cache"}, 	/* Winery: grapes 'coz they "bunch" */
+	{ "s",  "Unknown Cache"}, 	/* 'Suprise' cache: use a target. */
+	{ "ac",  "Event Cache"}, 	/* Event caches.  May be food. */
 	{ NULL, NULL } 
 };
 
diff --git a/gpsbabel/mkshort.c b/gpsbabel/mkshort.c
index c2fae3f4d..c292bf001 100644
--- a/gpsbabel/mkshort.c
+++ b/gpsbabel/mkshort.c
@@ -85,7 +85,7 @@ is_unique(mkshort_handle *h, char *name)
 }
 
 static
-int
+void
 add_to_hashlist(mkshort_handle *h, char *name)
 {
 	int hash = hash_string(name);
@@ -122,7 +122,7 @@ mkshort_add_to_list(mkshort_handle *h, char *name)
 	return name;
 }
 
-void *
+void
 mkshort_del_handle(void *h)
 {
 	mkshort_handle *hdr = h;
diff --git a/gpsbabel/util.c b/gpsbabel/util.c
index 415b23440..73852a1c5 100644
--- a/gpsbabel/util.c
+++ b/gpsbabel/util.c
@@ -453,13 +453,18 @@ get_cache_icon(const waypoint *waypointp)
 		case gc_micro: 
 			return "Micro-Cache";
 			break;
+		default:
+			break;
 	}
 	switch (waypointp->gc_data.type) {
 		case gt_virtual:
 			return "Virtual cache";
 		case gt_multi:
 			return "Multi-Cache";
-			break;
+		case gt_event:
+			return "Event Cache";
+		case gt_suprise:
+			return "Unknown Cache";
 		default:
 			break;
 	}
-- 
2.30.2